ChangeLog merge fixes.

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 5edbbdac653492431d5ce5d942b850ae58442707..5807863a9105d01110d5e65087fa19bc3fbee0fd 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -2,7 +2,6 @@
 
        * admin.el (set-copyright): Also handle \year in refcards/*.tex.
 
-2011-01-14  Eli Zaretskii  <eliz@gnu.org>
 2011-01-14  Glenn Morris  <rgm@gnu.org>
 
        * bzrmerge.el: Require cl when compiling.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 19f27ac6bb59ad63e5f6f0dac3cb82d07e48ad40..355c99668e322fd201c45385728e083249996ea4 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -2,7 +2,6 @@
 
        * nxml-mode.texi (Introduction): Fix file name typos.
 
-2011-01-14  Glenn Morris  <rgm@gnu.org>
 2011-01-13  Christian Ohler  <ohler@gnu.org>
 
        * ert.texi: New file.

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 06a5982e885951111951b6d1aec58078fc7c970c..eba668a69c7188d404573f41f9caa4230e8a7efa 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -12,11 +12,6 @@
        * refcards/vipcard.tex, refcards/viperCard.tex:
        Update short copyright year to 2011.
 
-2011-01-14  Kenichi Handa  <handa@m17n.org>
-
-       * NEWS: Describe the changes for rmail's MIME handling.
-
-2011-01-14  W. Martin Borgert <debacle@debian.org>  (tiny change)
 2011-01-13  Christian Ohler  <ohler@gnu.org>
 
        * NEWS: Mention ERT.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 05417b0a8c33766bc25934420a7b49a1a6bf7996..04784cd6cf34839235833032a2bcd78e463488de 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -7,33 +7,6 @@
 
        * progmodes/python.el (python-mode): Don't impose font-lock (bug#3628).
 
-2011-01-14  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-       * files.el (file-local-variables-alist):
-       Make permanent-local (bug#7767).
-
-2011-01-14  Glenn Morris  <rgm@gnu.org>
-
-       * version.el (emacs-copyright): Set short copyright year to 2011.
-
-2011-01-14  Mark Lillibridge  <mark.lillibridge@hp.com>  (tiny change)
-
-       * mail/mail-utils.el (mail-strip-quoted-names): Avoid clobbering
-       an existing temp buffer.  (Bug#7746)
-
-2011-01-14  Glenn Morris  <rgm@gnu.org>
-
-       * mail/mail-utils.el (mail-mbox-from): Handle From: headers with
-       multiple addresses.  (Bug#7760)
-
-2011-01-14  Michael Albinus  <michael.albinus@gmx.de>
-
-       * net/tramp.el (tramp-methods): Add recursive options to "scpc",
-       "scpx", "pscp" and "psftp".
-
-2011-01-14  Eli Zaretskii  <eliz@gnu.org>
-
-       * term/w32-win.el (image-library-alist): Set up correctly for
 2011-01-14  Kim F. Storm  <storm@cua.dk>
 
        * emulation/cua-base.el (cua--init-keymaps):

diff --git a/src/ChangeLog b/src/ChangeLog
index 03c99765639016e2f7c47bd6a2d8eb1baab8b6b0..6f419fcfb4338810de37c6da58a4a0ac2e677758 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,9 +1,3 @@
-2011-01-14  Eli Zaretskii  <eliz@gnu.org>
-
-       * image.c (png_jmpbuf): Remove definition.
-       (my_png_error, png_load): Don't use png_jmpbuf.
-
-2011-01-14  Eli Zaretskii  <eliz@gnu.org>
 2011-01-11  Tassilo Horn  <tassilo@member.fsf.org>
 
        * image.c (imagemagick_load_image, Finit_image_library): Free